From 7ee6021370efbb78340edb7a2025c8a721e29257 Mon Sep 17 00:00:00 2001 From: Andrew Paseltiner Date: Tue, 20 Oct 2015 13:26:16 -0400 Subject: [PATCH] Correct spelling in docs --- src/cargo/core/manifest.rs | 4 ++-- src/cargo/core/resolver/mod.rs | 2 +- src/doc/build-script.md | 2 +- src/doc/faq.md | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cargo/core/manifest.rs b/src/cargo/core/manifest.rs index 7d99b7c79..68f3d2d4c 100644 --- a/src/cargo/core/manifest.rs +++ b/src/cargo/core/manifest.rs @@ -10,7 +10,7 @@ use core::package_id::Metadata; use core::dependency::SerializedDependency; use util::{CargoResult, human}; -/// Contains all the informations about a package, as loaded from a Cargo.toml. +/// Contains all the information about a package, as loaded from a Cargo.toml. #[derive(Clone, Debug)] pub struct Manifest { summary: Summary, @@ -130,7 +130,7 @@ pub struct Profiles { pub custom_build: Profile, } -/// Informations about a binary, a library, an example, etc. that is part of the +/// Information about a binary, a library, an example, etc. that is part of the /// package. #[derive(Clone, Hash, PartialEq, Eq, Debug)] pub struct Target { diff --git a/src/cargo/core/resolver/mod.rs b/src/cargo/core/resolver/mod.rs index bfade9962..465bc1a73 100644 --- a/src/cargo/core/resolver/mod.rs +++ b/src/cargo/core/resolver/mod.rs @@ -24,7 +24,7 @@ //! * Never try to activate a crate version which is incompatible. This means we //! only try crates which will actually satisfy a dependency and we won't ever //! try to activate a crate that's semver compatible with something else -//! activatd (as we're only allowed to have one). +//! activated (as we're only allowed to have one). //! * Always try to activate the highest version crate first. The default //! dependency in Cargo (e.g. when you write `foo = "0.1.2"`) is //! semver-compatible, so selecting the highest version possible will allow us diff --git a/src/doc/build-script.md b/src/doc/build-script.md index 7f1016d29..8874bf912 100644 --- a/src/doc/build-script.md +++ b/src/doc/build-script.md @@ -304,7 +304,7 @@ fn main() { } ``` -This build script starts out by compiling out C file into an object file (by +This build script starts out by compiling our C file into an object file (by invoking `gcc`) and then converting this object file into a static library (by invoking `ar`). The final step is feedback to Cargo itself to say that our output was in `out_dir` and the compiler should link the crate to `libhello.a` diff --git a/src/doc/faq.md b/src/doc/faq.md index 1c6963ac2..61e0e8d61 100644 --- a/src/doc/faq.md +++ b/src/doc/faq.md @@ -135,7 +135,7 @@ wildcard dependency constraints.** While they _can_, strictly speaking, they should not. A version requirement of `*` says “This will work with every version ever,” which is never going -to be true. Libraries should always specifiy the range that they do work with, +to be true. Libraries should always specify the range that they do work with, even if it’s something as general as “every 1.x.y version.” # Why `Cargo.toml`? -- 2.30.2